Skip to content

added a fixed control period to loop (backport #647)#651

Merged
bmagyar merged 2 commits intofoxyfrom
mergify/bp/foxy/pr-647
Feb 23, 2022
Merged

added a fixed control period to loop (backport #647)#651
bmagyar merged 2 commits intofoxyfrom
mergify/bp/foxy/pr-647

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Feb 16, 2022

This is an automatic backport of pull request #647 done by Mergify.
Cherry-pick of 4d2bce8 has failed:

On branch mergify/bp/foxy/pr-647
Your branch is up to date with 'origin/foxy'.

You are currently cherry-picking commit 4d2bce8.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   controller_manager/src/ros2_control_node.cpp

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* added a fixed control period to loop

* fixe formatting

* Improvements to naming convention and readability

Co-authored-by: Denis Štogl <destogl@users.noreply.github.com>

* Removed unnecessary code missed in last commit

Co-authored-by: Denis Štogl <destogl@users.noreply.github.com>

* updated variable begin to current_time

Co-authored-by: Denis Štogl <destogl@users.noreply.github.com>
(cherry picked from commit 4d2bce8)

# Conflicts:
#	controller_manager/src/ros2_control_node.cpp
@mergify mergify bot added the conflicts label Feb 16, 2022
@destogl destogl self-requested a review February 17, 2022 08:07
@destogl destogl self-assigned this Feb 17, 2022
@destogl destogl requested a review from bmagyar February 22, 2022 21:24
@bmagyar bmagyar merged commit b7e29fc into foxy Feb 23, 2022
@mergify mergify bot deleted the mergify/bp/foxy/pr-647 branch February 23, 2022 10:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants